(emacs-copyright): New constant.

diff --git a/lisp/version.el b/lisp/version.el
index 0ed3927d0fc71ce62b51164a9ce4970cae4d8da1..034a2ff5515ac6e33d668401cb83e223cf57f693 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -27,6 +27,9 @@
 
 ;;; Code:
 
+(defconst emacs-copyright "Copyright (C) 2007 Free Software Foundation, Inc."
+  "Short copyright string for this version of Emacs.")
+
 (defconst emacs-version "22.1.50" "\
 Version numbers of this version of Emacs.")
 

diff --git a/src/ChangeLog b/src/ChangeLog
index f4cc9014c1687190e4d7a605bed5c3f89b1b5e6d..eb0040b371af67473d3bdb1ca6496b2464975008 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-07  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.c (main): Use `emacs-copyright' in --version output.
+
 2007-06-06  Chong Yidong  <cyd@stupidchicken.com>
 
        * image.c (xpm_load): Remove spurious call to